From a1a357fcf5e7e2f49dfc45a138c15f504ae1b481 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= Date: Wed, 5 Feb 2020 13:51:19 +0100 Subject: [PATCH] Revert "tools/libxc: disable x2APIC when using nested virtualization" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 7b3c5b70a32303b46d0d051e695f18d72cce5ed0 and re-enables the usage of x2APIC with nested virtualization. Signed-off-by: Roger Pau Monné Acked-by: Wei Liu --- tools/libxc/xc_cpuid_x86.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index ac38c1406e..2540aa1e1c 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -653,17 +653,6 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, p->extd.itsc = true; p->basic.vmx = true; p->extd.svm = true; - - /* - * BODGE: don't announce x2APIC mode when using nested virtualization, - * as it doesn't work properly. This should be removed once the - * underlying bug(s) are fixed. - */ - rc = xc_hvm_param_get(xch, domid, HVM_PARAM_NESTEDHVM, &val); - if ( rc ) - goto out; - if ( val ) - p->basic.x2apic = false; } rc = x86_cpuid_copy_to_buffer(p, leaves, &nr_leaves); -- 2.30.2